New functions to construct named cursors and to get the image used for a

2005-06-14  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdk.symbols:
	* gdk/gdkcursor.h:
	* gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image)
	(gdk_cursor_new_from_name): New functions to construct named
	cursors and to get the image used for a cursor.

diff --git a/ChangeLog b/ChangeLog
index 28a1bf8a44c462fbfc4675ed2ad63a8d6484179d..da98a6a3e3857966c4601f2da27a769faba69b61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkcursor.h: 
+       * gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image) 
+       (gdk_cursor_new_from_name): New functions to construct named
+       cursors and to get the image used for a cursor.  
+
 2005-06-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 28a1bf8a44c462fbfc4675ed2ad63a8d6484179d..da98a6a3e3857966c4601f2da27a769faba69b61 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkcursor.h: 
+       * gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image) 
+       (gdk_cursor_new_from_name): New functions to construct named
+       cursors and to get the image used for a cursor.  
+
 2005-06-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 28a1bf8a44c462fbfc4675ed2ad63a8d6484179d..da98a6a3e3857966c4601f2da27a769faba69b61 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkcursor.h: 
+       * gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image) 
+       (gdk_cursor_new_from_name): New functions to construct named
+       cursors and to get the image used for a cursor.  
+
 2005-06-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 96eaf740ac649d4f4dd8b0d2439a81701654dc94..73fc0bd396ddb162d2d443368e897baf126c3376 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -355,6 +355,8 @@ gdk_cursor_get_display
 gdk_cursor_new_for_display
 gdk_cursor_new_from_pixbuf
 gdk_cursor_new_from_pixmap
+gdk_cursor_new_from_name
+gdk_cursor_get_image
 #endif
 #endif
 

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index c91c3d30d0b432b8d375a63de40f6f26d32334e9..ed93ccb98cdca5fcc25faffec5be5c90d72f7297 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -123,6 +123,9 @@ GdkCursor* gdk_cursor_new_from_pixbuf        (GdkDisplay      *display,
 GdkDisplay* gdk_cursor_get_display      (GdkCursor       *cursor);
 GdkCursor*  gdk_cursor_ref               (GdkCursor       *cursor);
 void        gdk_cursor_unref             (GdkCursor       *cursor);
+GdkCursor*  gdk_cursor_new_from_name    (GdkDisplay      *display,
+                                         const gchar     *name);
+GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
 
 #ifndef GDK_DISABLE_DEPRECATED
 #define gdk_cursor_destroy             gdk_cursor_unref

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 6a7b3335c949f97123f902515efdbe1e00edec40..b9c27fe2a02154f222307ae8848ab9e0aeb75375 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -30,12 +30,17 @@
 #ifdef HAVE_XCURSOR
 #include <X11/Xcursor/Xcursor.h>
 #endif
+#ifdef HAVE_XFIXES
+#include <X11/extensions/Xfixes.h>
+#endif
+#include <string.h>
 
 #include "gdkprivate-x11.h"
 #include "gdkcursor.h"
 #include "gdkpixmap-x11.h"
 #include "gdkx.h"
 #include <gdk/gdkpixmap.h>
+#define GDK_PIXBUF_ENABLE_BACKEND
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gdkalias.h"
 
@@ -126,6 +131,7 @@ gdk_cursor_new_for_display (GdkDisplay    *display,
   private = g_new (GdkCursorPrivate, 1);
   private->display = display;
   private->xcursor = xcursor;
+  private->name = NULL;
   cursor = (GdkCursor *) private;
   cursor->type = cursor_type;
   cursor->ref_count = 1;
@@ -229,6 +235,7 @@ gdk_cursor_new_from_pixmap (GdkPixmap      *source,
   private = g_new (GdkCursorPrivate, 1);
   private->display = display;
   private->xcursor = xcursor;
+  private->name = NULL;
   cursor = (GdkCursor *) private;
   cursor->type = GDK_CURSOR_IS_PIXMAP;
   cursor->ref_count = 1;
@@ -248,6 +255,7 @@ _gdk_cursor_destroy (GdkCursor *cursor)
   if (!private->display->closed && private->xcursor)
     XFreeCursor (GDK_DISPLAY_XDISPLAY (private->display), private->xcursor);
 
+  g_free (private->name);
   g_free (private);
 }
 
@@ -302,6 +310,89 @@ gdk_cursor_get_display (GdkCursor *cursor)
   return ((GdkCursorPrivate *)cursor)->display;
 }
 
+#if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
+
+/**
+ * gdk_cursor_get_image:
+ * @cursor: a #GdkCursor
+ *
+ * Returns a #GdkPixbuf with the image used to display the cursor.
+ *
+ * Note that depending on the capabilities of the windowing system and 
+ * on the cursor, GDK may not be able to obtain the image data. In this 
+ * case, %NULL is returned.
+ *
+ * Returns: a #GdkPixbuf representing @cursor, or %NULL
+ *
+ * Since: 2.8
+ */
+GdkPixbuf*  
+gdk_cursor_get_image (GdkCursor *cursor)
+{
+  Display *xdisplay;
+  GdkCursorPrivate *private;
+  XcursorImages *images = NULL;
+  XcursorImage *image;
+  Atom atom;
+  gint size;
+  gchar buf[32];
+  guchar *data;
+  GdkPixbuf *pixbuf;
+  gchar *theme;
+
+  g_return_val_if_fail (cursor != NULL, NULL);
+
+  private = (GdkCursorPrivate *) cursor;
+    
+  xdisplay = GDK_DISPLAY_XDISPLAY (private->display);
+
+  size = XcursorGetDefaultSize (xdisplay);
+  theme = XcursorGetTheme (xdisplay);
+
+  if (cursor->type == GDK_CURSOR_IS_PIXMAP)
+    {
+      if (private->name)
+       images = XcursorLibraryLoadImages (private->name, theme, size);
+    }
+  else 
+    images = XcursorShapeLoadImages (cursor->type, theme, size);
+
+  if (!images)
+    return NULL;
+  
+  image = images->images[0];
+
+  data = g_malloc (4 * image->width * image->height);
+  memcpy (data, image->pixels, 4 * image->width * image->height);
+
+  pixbuf = gdk_pixbuf_new_from_data (data, GDK_COLORSPACE_RGB, TRUE,
+                                    8, image->width, image->height,
+                                    4 * image->width, 
+                                    (GdkPixbufDestroyNotify)g_free, NULL);
+
+  if (private->name)
+    gdk_pixbuf_set_option (pixbuf, "name", private->name);
+  g_snprintf (buf, 32, "%d", image->xhot);
+  gdk_pixbuf_set_option (pixbuf, "x_hot", buf);
+  g_snprintf (buf, 32, "%d", image->yhot);
+  gdk_pixbuf_set_option (pixbuf, "y_hot", buf);
+  
+  XcursorImagesDestroy (images);
+
+  return pixbuf;
+}
+
+#else
+
+GdkPixbuf*  
+gdk_cursor_get_image (GdkCursor *cursor)
+{
+  g_return_val_if_fail (cursor != NULL, NULL);
+  
+  return NULL;
+}
+
+#endif
 
 #ifdef HAVE_XCURSOR
 
@@ -412,6 +503,52 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
   private = g_new (GdkCursorPrivate, 1);
   private->display = display;
   private->xcursor = xcursor;
+  private->name = NULL;
+  cursor = (GdkCursor *) private;
+  cursor->type = GDK_CURSOR_IS_PIXMAP;
+  cursor->ref_count = 1;
+  
+  return cursor;
+}
+
+/**
+ * gdk_cursor_new_from_name:
+ * @display: the #GdkDisplay for which the cursor will be created
+ * @name: the name of the cursor
+ *
+ * Creates a new cursor by looking up @name in the current cursor
+ * theme. 
+ * 
+ * Returns: a new #GdkCursor, or %NULL if there is no cursor with 
+ *   the given name 
+ *
+ * Since: 2.8
+ */
+GdkCursor*  
+gdk_cursor_new_from_name (GdkDisplay  *display,
+                         const gchar *name)
+{
+  Cursor xcursor;
+  Display *xdisplay;
+  GdkCursorPrivate *private;
+  GdkCursor *cursor;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  if (display->closed)
+    xcursor = None;
+  else 
+    {
+      xdisplay = GDK_DISPLAY_XDISPLAY (display);
+      xcursor = XcursorLibraryLoadCursor (xdisplay, name);
+      if (xcursor == None)
+       return NULL;
+    }
+
+  private = g_new (GdkCursorPrivate, 1);
+  private->display = display;
+  private->xcursor = xcursor;
+  private->name = g_strdup (name);
   cursor = (GdkCursor *) private;
   cursor->type = GDK_CURSOR_IS_PIXMAP;
   cursor->ref_count = 1;